Fall back to GtkSearchEngineSimple only if gthread has already been

2007-05-11  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtksearchengine.c (_gtk_search_engine_new): Fall back
	to GtkSearchEngineSimple only if gthread has already been
	initialiased; otherwise, disable search support in the file
	chooser widget.  (#435847)

svn path=/trunk/; revision=17819

diff --git a/ChangeLog b/ChangeLog
index 2e9e110a792ec91b0cb7cfd5eb5b83c978fa86d4..8a4020192a447a2ca7506c7fba4261ba998048be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-11  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtksearchengine.c (_gtk_search_engine_new): Fall back
+       to GtkSearchEngineSimple only if gthread has already been
+       initialiased; otherwise, disable search support in the file
+       chooser widget.  (#435847)
+
 2007-05-10  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_set_image): Unparent the old

diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
index 196e944d8e341a6562fbe1b25251002cf4f108d5..85145d02e6abaf572dd79a926c3a7c3aa7987863 100644 (file)
--- a/gtk/gtksearchengine.c
+++ b/gtk/gtksearchengine.c
@@ -104,7 +104,7 @@ _gtk_search_engine_init (GtkSearchEngine *engine)
 GtkSearchEngine *
 _gtk_search_engine_new (void)
 {
-  GtkSearchEngine *engine;
+  GtkSearchEngine *engine = NULL;
        
 #ifdef HAVE_TRACKER
   engine = _gtk_search_engine_tracker_new ();
@@ -118,7 +118,9 @@ _gtk_search_engine_new (void)
     return engine;
 #endif
 
-  engine = _gtk_search_engine_simple_new ();
+  if (g_thread_supported ())
+    engine = _gtk_search_engine_simple_new ();
+  
   return engine;
 }